bitkeeper revision 1.1159.212.104 (4206121fBCAx-xpYAHk3p-Gk_3xChw)
authorkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:48:31 +0000 (12:48 +0000)
committerkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:48:31 +0000 (12:48 +0000)
Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/dom0_ops.c

Simple merge